From 8582d429a132dc50f7b6ef15b1d0cfb286a0aa26 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 15 Jul 2010 16:32:50 +0100 Subject: [PATCH] xm: Do not check path of kernel if bootloader is specified When create DomU, if bootloader is specified, 'kernel/ramdisk' will be used by bootloader when boots DomU. So it is needless to check the path is existent or not. Signed-off-by: Yu Zhiguo Acked-by: Ian Campbell --- tools/python/xen/xm/create.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/python/xen/xm/create.py b/tools/python/xen/xm/create.py index 7a2eb142ce..68cc8e86a4 100644 --- a/tools/python/xen/xm/create.py +++ b/tools/python/xen/xm/create.py @@ -708,7 +708,12 @@ def configure_image(vals): return None config_image = [ vals.builder ] if vals.kernel: - if os.path.dirname(vals.kernel) != "" and os.path.exists(vals.kernel): + if vals.bootloader: + # If bootloader is specified, vals.kernel will be used + # by bootloader when boots DomU. So it is needless to + # check the path is existent or not. + config_image.append([ 'kernel', vals.kernel ]) + elif os.path.dirname(vals.kernel) != "" and os.path.exists(vals.kernel): config_image.append([ 'kernel', vals.kernel ]) elif vals.kernel == 'hvmloader': # Keep hvmloader w/o a path and let xend find it. @@ -721,7 +726,10 @@ def configure_image(vals): else: raise ValueError('Cannot find kernel "%s"' % vals.kernel) if vals.ramdisk: - if os.path.dirname(vals.ramdisk) != "" and os.path.exists(vals.ramdisk): + if vals.bootloader: + # Same with 'kernel' above + config_image.append([ 'ramdisk', vals.ramdisk ]) + elif os.path.dirname(vals.ramdisk) != "" and os.path.exists(vals.ramdisk): config_image.append([ 'ramdisk', vals.ramdisk ]) elif os.path.exists(os.path.abspath(vals.ramdisk)): # Keep old behaviour, if path is valid. -- 2.30.2